Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 05:25:35 +0000 (22:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 3 Jul 2011 05:25:35 +0000 (22:25 -0700)

Trivial merge